bitkeeper revision 1.1159.1.552 (420918f8LzMe7S_sxvvaHtdM_xcpYg)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/arch/x86/mm.c
Simple merge

diff --cc xen/arch/x86/vmx.c
Simple merge

diff --cc xen/include/asm-x86/shadow.h
Simple merge